Use _gtk_accessible_set_factory_type in GtkSeparatorMenuItem
authorMatthias Clasen <mclasen@redhat.com>
Thu, 17 Feb 2011 06:34:10 +0000 (01:34 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 17 Feb 2011 06:34:10 +0000 (01:34 -0500)
gtk/gtkseparatormenuitem.c

index 664d349b07fef26a978049adf74b6ac210985f0f..96f21198425484434a89e765b516b37e9dea5a24 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "gtkaccessible.h"
+#include "gtkaccessibleprivate.h"
 #include "gtkseparatormenuitem.h"
 
 /**
@@ -133,28 +133,12 @@ gtk_separator_menu_item_accessible_factory_init (AtkObjectFactory *factory)
 static AtkObject *
 gtk_separator_menu_item_get_accessible (GtkWidget *widget)
 {
-  static gboolean initialized = FALSE;
+  static gboolean initialized = FALSE
 
   if (G_UNLIKELY (!initialized))
     {
-      AtkObjectFactory *factory;
-      AtkRegistry *registry;
-      GType derived_type;
-      GType derived_atk_type;
-
-      /* Figure out whether accessibility is enabled by looking at the
-       * type of the accessible object which would be created for our
-       * parent type
-       */
-      derived_type = g_type_parent (GTK_TYPE_SEPARATOR_MENU_ITEM);
-
-      registry = atk_get_default_registry ();
-      factory = atk_registry_get_factory (registry, derived_type);
-      derived_atk_type = atk_object_factory_get_accessible_type (factory);
-      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
-        atk_registry_set_factory_type (registry,
-                                       GTK_TYPE_SEPARATOR_MENU_ITEM,
-                                       gtk_separator_menu_item_accessible_factory_get_type ());
+      _gtk_accessible_set_factory_type (GTK_TYPE_SEPARATOR_MENU_ITEM,
+                                        gtk_separator_menu_item_accessible_factory_get_type ());
 
       initialized = TRUE;
     }